Some changes to do a "proper" install.

Some changes to do a "proper" install.

Makefile doesnt work, however.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 93726c10db027d5e82d89978e83679449ba6c4cc..eb05ce77def8c155b7bc637a7872217ee58d9098 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,13 +1,7 @@
-
-lib_LTLIBRARIES =              \
-       libgdk-pixbuf.la        \
-       libpixbuf-png.la        \
-       libpixbuf-jpeg.la       \
-       libpixbuf-gif.la        \
-       libpixbuf-xpm.la        \
-       libpixbuf-tiff.la
-
+common_ldflags = -aviod-version
 noinst_PROGRAMS = testpixbuf
+loader_dir=$(libdir)/gdk-pixbuf/loaders
+DEFS = -DPIXBUF_LIBDIR="$(loader_dir)"
 DEPS = libgdk-pixbuf.la
 LDADDS = libgdk-pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 
@@ -30,35 +24,45 @@ libgdk_pixbufinclude_HEADERS =      \
 #
 # The PNG plugin.
 #
-libpixbuf_png_la_SOURCES =     \
-       io-png.c
-libpixbuf_png_la_LDFLAGS = -avoid-version
-libpixbuf_png_la_LIBADD = -lpng -lz
+libpixbuf_png_la_SOURCES = io-png.c
+libpixbuf_png_la_LDFLAGS = $(common_ldflags)
+libpixbuf_png_la_LIBADD = $(PNGLIBS)
 
 #
 # The JPEG loader
 #
-libpixbuf_jpeg_la_SOURCES =    \
-       io-jpeg.c
-libpixbuf_jpeg_la_LDFLAGS = -avoid-version
-libpixbuf_jpeg_la_LIBADD = -ljpeg
+libpixbuf_jpeg_la_SOURCES = io-jpeg.c
+libpixbuf_jpeg_la_LDFLAGS = $(common_ldflags)
+libpixbuf_jpeg_la_LIBADD = $(JPEGLIBS)
 
 #
 # The XPM loader
 #
-libpixbuf_xpm_la_SOURCES =     \
-       io-xpm.c
+libpixbuf_xpm_la_SOURCES = io-xpm.c
+libpixbuf_xpm_la_LDFLAGS = $(common_ldflags)
+libpixbuf_xpm_la_LIBADD =
+
 
 #
 # The GIF loader
 #
-libpixbuf_gif_la_SOURCES =     \
-       io-gif.c
-libpixbuf_gif_la_LDFLAGS = -avoid-version
-libpixbuf_gif_la_LIBADD= -lungif
+libpixbuf_gif_la_SOURCES = io-gif.c
+libpixbuf_gif_la_LDFLAGS = $(common_ldflags)
+libpixbuf_gif_la_LIBADD= $(GIFLIB)
 
 #
 # The TIFF loader
 #
-libpixbuf_tiff_la_SOURCES=     \
-       io-tiff.c
+libpixbuf_tiff_la_SOURCES = io-tiff.c
+libpixbuf_tiff_la_LDFLAGS = $(common_ldflags)
+libpixbuf_tiff_la_LIBADD = $(TIFFLIB)
+
+lib_LTLIBRARIES =               \
+        libgdk-pixbuf.la 
+
+libpixbufloader_DATA =         \
+       libpixbuf-tiff.la       \
+       libpixbuf-gif.la        \
+       libpixbuf-xpm.la        \
+       libpixbuf-jpeg.la       \
+       libpixbuf-png.la

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 5895486d4faf778c535af1ad0242e7807063b61c..257a454f120fe2db9ce49c3b22e2ba211f485504 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -10,8 +10,6 @@
 #include <gmodule.h>
 #include "gdk-pixbuf.h"
 
-#define PIXBUF_LIBDIR "."
-
 static gboolean
 pixbuf_check_png (unsigned char *buffer, int size)
 {